merge trunk
authorK. Handa <handa@gnu.org>
Wed, 24 Apr 2013 14:42:07 +0000 (23:42 +0900)
committerK. Handa <handa@gnu.org>
Wed, 24 Apr 2013 14:42:07 +0000 (23:42 +0900)

Trivial merge